From: Kenichi Handa <handa@etlken>
Date: Wed, 21 Apr 2010 00:49:01 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~19^2~23^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2505e667aeab4ab7bd058ebbfe57b7c2049b5d77;p=emacs.git

merge trunk
---

2505e667aeab4ab7bd058ebbfe57b7c2049b5d77
diff --cc lisp/ChangeLog
index 57e7af58254,0b860d76e1d..255a20a4826
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,22 +1,28 @@@
 +2010-04-20  Kenichi Handa  <handa@m17n.org>
 +
 +	* language/indian.el (oriya-composable-pattern)
 +	(tamil-composable-pattern, malayalam-composable-pattern): Add
 +	two-part vowels to "v" (vowel sign).
 +
+ 2010-04-20  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* files.el (copy-directory): Handle symlinks (Bug#5982).
+ 
+ 	* progmodes/compile.el (compilation-next-error-function): Revert
+ 	2009-10-12 change (Bug#5983).
+ 
+ 2010-04-20  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+ 	* vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
+ 	(vc-hg-working-revision): Likewise.  Use hg parents, not hg parent
+ 	(Bug#5846).
+ 
+ 2010-04-20  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.
+ 
+ 	* minibuffer.el (completion-at-point): Doc fix.
+ 
  2010-04-18  Chong Yidong  <cyd@stupidchicken.com>
  
  	* cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Don't